Build changes (multiplatform)
Cleaned up Makefile (unix)