addressed 2/3 feedback items