synch back to desktop
Merge remote-tracking branch 'origin/master'
cleaned up a lot