Some further Changes
Continued tidying