Squashing bugs
Get 160 Jasmine testpoints passing.