additional fixes and tweaks