Fixed timer issues etc.