Address fixes 4

Fixed
Awesome job! Go ahead and merge this back into master.