Fix references in makefile and updated signatures of a few functions
Wire everything up and fix some derping