cleanups and improvements