A few bug fixes, a few created :)