J. El Tanquista: Minor Fixes

Minor internal fixes and improvements.