Update everything to the state of the art
Smaller fixes