fix comments and remove millis