bug fixes
frame calculation mixin fixes