couple improvements