better description, small bugfixes