made fixes according to google doc