many small tweaks