correct indentation and range definitions and rendering added