Worked on makefile, fixed small bugs