reducing comments...
bugfixes