Laying the groundwork on QED, bug fixes