more tweaks. shouldn't have rushed