Large round of improvements