changed makefiles to leave the .o file so incremental make works correctly
some fixes and api changes