fixed up ignore
various small cleanups