Merge pull request #52 from Blazinn/gb-cleanup

Fix a few issues with multiple GBs on a page
Fixes