name changes, small tweaks
more tweaks