fixes etc... release soon....