tweaks and some small fixes