Makes it so names are the same as keys, improves some names, use RectF instead of Rect for selectionRect.