Fixes (major) annoyances like boat behavior and backports useful features like enhanced pick block.