Revised some stuff from way back. Don't know which files are updated