Some fixes, added Udyr R