some progress with reset/clear button + some cleanup.