Merge in changes from work computer
Do some cleanup