comment fixes and test changes

-cleaning code as i go through STS