J. El Tanquista: Bug Fixes and Stability Improvements

Minor bugs were fixed along with general stability and performance improvements.