-some bugfixes (still some left)