fix DSL parser for nesting > 2 levels 

and disk definition