bunch more tweaks