Fix Whirlwind
Fix some more ui issues and fix play with target get