Main
First fixes
Merge https://github.com/dex3r/UDSTURPG