some inconsitstencies introduced since I last worked on this cleaned out, in a hacky sort of way