bug fixes to framing