Help changes

Changes suggested by Andrea and file clean up.