wrapping some more fields

PrisonFile is now also a BlockWrapper