Some slight improvements, to be continued