made lots of progress and optimized lots of routines, almost ready for full run