Only a few minor things done. A little text editing and added pass on some definations.