Fixed properties and documentations