Added start adjustment for annulusplots and cleaned up