Fix the 6 hour bug, add some changes in preperation for dual-extrusion.