reviving, fixing compile time issues, correcting makefile