Update to multi-platform py script
Cleanup
Makefile improvements