Clean up of missing files, improved setup
fix upload