tweaking

- number of small tweaks