Cleaned up, makefile working and completely removed traces of literals