bunch of other improvements