Your very lucky you got it back in right.
Test: have someone spin the prop as you try shifting the control.
VERY IMPORTANT to spin the prop, you can do damage to the linkage and control if not spinning.
Spin, shift and it should go into gear and lock the prop in both directions.
The drain plug...