A grab bag of different improvements

dslkjskl