added more granular swatch time, small refactoring

Works in the simulator!