Squashed some bugs but others remain.