cleanups
fixes