Slight tidy of name parsing
Tidy trap parsing
Update terrain.txt parsing
Use the terrain dig field, not convinced about resulting messages