Got user edit path working. Other general house cleaning.