Integrate Philipp’s recommendations, improve high availability section