further clean up, minor changes to get the tables right for my draft