fixes/cleanups