Completion of Makefile and README, added more options to main