Cleaned up user management and started handling non fb user content