lots of changes; nearing final draft