bugfixes, removed plural