design and small bugfixes