Minor additions and commenting