add shapeVsList etc to dispatch table

renamed some functions for more readability