Fixes via testing.... Lots of testing.