Fixed miscellaneous issues

-Added makefile
-updated method declaration
-fixed a number of include statements
See the above comment