minor fixes/finalize