minor changes, commenting