placement and commenting changes