Merging my branch to fix everything

makegonow