few tweaks to get it going right