few tweaks, now testing