I feel switching between weapons should cost an action. This would make throwing weapons more useful. What's the point of a javelin when you can just shoot a bow or crossbow? As I missing something?