The God Unit: Mini-patch

Some bug fixes.