Cleanup, UID, minor fixes

MathUtils type corrections
UID tool