misc fixes so I can read this