Slugs and Bugs: Conversion: Patch 0.8.5.2

Small Patch Fixing Minor bug Fixes