Tons of fixes and additions - didn't keep track :-)