fixes and changes from self review