Fix compiler warnings
Clean up makefile
Compile with clang and gcc