fix bad merge
more tweaks + fixes