Added end triggers
tweaked stick length & misc changes