some little fixes CS