Removed old code and notes, fixed some tabs.