updates per Vince requests and tests passing