changed package names and some last bug fixes