Updates and timer bugfix