Cleared makefile
Added and improved compile-time features