Adding the official Jon Chan clock (as well as some other tweaks)