small fixes, name changes, cleanup