Fixed a number of small persistence bugs, made color assignment on click only;