fixed timer, fixed blocking camera bug