Angle fix, better dust implementation.