little fixes in the code