Fixing typos and logic flaws
... sausage making