KISS
misc fixes