General cleanups

fixed