Cleaned up comments, consolidated ENVs, restored -j3 for make