more tweaks. killed off some stuff