Fixed time scale bug by making the times save to strings in json
Housekeeping and spring cleaning of code