General Bug Fixes

Deployed several bug fixes to improve stability.