Patch of fixes for bugs and oversights

It does, yes.
(http://baystation12.net/forums/viewtopic.php?f=5&t=11091&p=236382#p236382)