Minor corrections and improvements based on feedback