Improved switching, added sword and branch

Now you can switch with J in your hand balblabla