Fix order of compositors
Refine angle/distance calculations