Modified and Fixed issues

This is an updated copy of the framework, updated but in beta.