Framework update, bug fixing