Feature/improvements

a few corrections