Fixed known bugs

Will soon begin working on two-player functionality.