various additions, tidy up file.