Expanding Name generator and increase weighting on tags
Add random trap generator