Work on user profiles + some bug fixes