Address Changes, Drop Off Fixes, Etc.

Signed-off-by: Scott Szarapka <scott@szarapka.com>