Update predefined tool and skill list
Update database
Add skills deref
Fix typo