Adding std dev to classifier
Happier mappings for small grids
better mapping for circles
Octave bounds for mapping circles