Fixed timer bugs and derps