Fixes and changes and additions