Fixes, removals and clarifications.