Made lots of changes on users and comments, still in broken state :-(