more cleanups and additions from ada