Various tweeks and clarifications