fix stuff
minor formatting changes
add maintanace window
Merge branch 'release/2.2.5.1'