Replaced old makefile, updated script, cleaned trash