Fixed angular alignment
More fixes