Undispatch points

This branch introduces some more points in order to reduce the number of x/y member variables used to represent coordinates. Some simplifications ensue.