A lot of improvements, reordering and almost 100% master