Various small tweaks

Cleaned up some inaccurate comments. Tweaked some names. Changed some comments for clarity. Removed some unused code that was commented out. Other stuff.