Tweaked some features, cleaned up commented-out code