misc shit
misc fixes