Fixed miscellaneous issues

-Added makefile
-updated method declaration
-fixed a number of include statements
All the above include paths are default, you can delete them.