removing cruft
bugfixes
bugfixes