Bugfixes for my first Goodie