fixes, cleanup