More bug fixes and framework changes, a little more stable