Clock fix
Some shit changes