more tweaks and organization