Crushed some minor Bugs