fixed some CustomUser bugs and cleaned up some things