Marius

Second time pass with a few minors, 25 hours in total