more testing and a few tweaks