Integrate Cezarys comments, and enhance some other parts.