getting closer to next release, few more issues to solve