Various fixes from re-watching lesson 14