Cleanup of code.  Adding in statuses and user profile items.