Fixed a few more bugs causing the clock to not flip