Framework bugfixing completed