Clean Fix

Updates under the direction of Frank...and a few of my own.