Added better comments and makefile changes