add comments, indicator display fixes