Some clean and little fixes

some little fixes