Lots of good code cleanup and streamlining, getting somewhere!