repackaging, small tweaks