NO IMPROVEMENT. Just Removing some old stuff & fixing a bug.