More minor fixes, down to the final handful to having a perfect warsh text