fixed framework bugs