many many small tweaks