more major tweaks