major tweaks and fixes