more changes

less yelling
Oren you are the best programmer ever!