A bunch of small fixes, put the /users/ stuff in boxes, some cleanup, some database changes