More bugfixes.
Merge pull request #4 from Pawbla/GUI

More bugfixes.