bugfixes, added classes package