Making Makefile more correct
Fixing some things so they work better on Ubuntu