More improvements here and there