More Changes

Tidyied up Etc...