Finally removed that useless block
First sword implemented. More to come
Misc changes