micro macro scaling
Merge branch 'marc' into denny
Finetunung MM light and Rotation