final framework tweaks