Bugfixes and implementation of "vorhanden"