Included review comments - and fixed errors