made final sweep, looks good