fixed minor stuff wiht time