Edit-Mode implemented and fixed some Bugs