Updates towards Blaze, and formatting fixes