framework upgrade and bugfixing