Fixed miscellaneous issues

-Added makefile
-updated method declaration
-fixed a number of include statements
Then remove one at a time and find out.