Some corrections based on guidelines