improvements

<1of2>