Comments and final touches