final version, fix syntaxis + comments