Fixed some bugs. Improved Framework