additional fixes and modifications