Finishing up

updated read, removed last vestiges of old design, fixed test calls
that I may have missed