refactoring, javadocs, new things, prepeare for debukkititzation