minor reenabling
some cleanups and merges