thinking about numbers
clean up substitution map bits
clean up types