last minute buggfixes :)