Updated framework again

Some tweaks to the framework from the teacher.