fixed timer issues and NPEs