small changes to framework, improved speed of crafter.