Continued making fixes and streamlining.