More comments and construction functions.