Clean Up, and a fix for profile updating.