various changes and additions...