adding a few tweaks and fixes/workarounds