Last final touches in commenting
API