made various modifications to the framework and default formatting