changes to server and profile
committing to merge
style changes