further improved consistency checks
safely improved syntactical presentation