Cleaning up Makefile, fixing env port handling.