tweaks and organization