Merge pull request #1117 from conejoninja/hotfixes

copied bender into gui