minor changes, 2 parts done