improvements here and there