updates as per fred and other cleanup