fixed comments time and errors