Bug fixed and Jitsu stuff