Profile updates

More updates based on Aasim's feedback.