Comments and definitions improvements