All fixed, except for some TODO's in usermenu