icky commit wif lots of misc fixes