The Attic: Early April Patch

Optimization patch Bug fixes