Misc changes
Removed archive and improved makefile