Bugfixes, and more features, still some bugs...