Updated make file to correct bugs