renamed and moven clock updated
some minor bugs fixed