Fixing a few bugs found by Mr K
Merge branch 'devbread' of https://github.com/Half-Shot/bread into devbread