Some minor changes + order + noise fix!