Add spades and wood tools to type conversion
Formatting
Fix mod addition logic