some more changes and additions