Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors.