Even More Changes!

Added some things to things that needed things added.