Sync

merges in port docking + fixes made after we merged,
+ a god mode setting.