Versioning started, Makefile fixes and TODO list updated