Significant fixes and clarifications