final bug fix, ready for alpha release