Minor Changes and Fixes. Be advised while it will all compile... there could be unintended FAILURE rubbed on everything. v0.40.06