Numerous additions, including treasure list