Small correction
Parsing and parameter display etc. setup improved