Add comments and descriptions