small bugfixes + some new new features