QA upload, fix 3 bugs & modernize build