completed migration of all per user create machine functions

and fixed several errors any many places

everything is entire untested