UVarious fixes
Trying to fix.... this branch is messed up.