many small changes
some small tweaks