Small lisibility fixes
Other little fixes