bugfixes
bugfixes, included updated jar