Lots of small tweaks
More small tweaks
Fixed gcamp with aaron