Makefile updates
Late fixes
More bugfixes