fix up more blah blah blah