more progress and updated readme and makefile