more changes

less yelling