Fixed forward stop and added reverse tap