Some Changings

Bugfixes, new Functionality (editing, usw.)