more framework tweaks