Mac 911

Bugs & Fixes: Tying up loose ends