fix regression; cleanups