bug fixes
Merge branch 'biggerfisch'