Horse handling and a couple misc fixes.