fixed lots of oopsies.