Some refactoring, fixed some issues added daggers and fist weapons.