fix bugs and oversights