added some more little fixes.