more big changes, gather manager should be semi functional now with lots of bug fixes to come
Merge remote-tracking branch 'origin/master'