Comments, fixes and parseTime function