removed secondary clock
added more settings and solidified functionality