fixed the framework, also made lots of other progress