Last modifications

New coments, cleaning code and small modifications