More workshop code + UGeo improvements
Optimized UGeo, added various fixes