iron out last quirks