Some more modifications for extra tuning options an stick support