Assignment 1 + 1.2 - Major bug fixes