random fixes/cleanups