Modify release build to work properly
Clean up build system a bit