made private things private
Improved makefile setup