Cleaner (and working) Makefile, small fixes