42maelstrom to master + some extra comments