Various fixes and clarification