More improvements and formalities