added/reorganized comments