corrections/improvements