misc changes + fixes