no major changes, some streamlining, just doing this because about to do a major change to the code