fixed timer issues