- moved some more userdata related stuff around