That wasn't right
Fixed up last few bugs.