edited makefile and main

put some stuff back in