pull in changes that were added

since i don't mess with my own, lets pull the changes from bobby's since i modify that one alot.