Corrected the last oversights and issues found by Simon. Ready to publish!