Comments and other few changes