I seriously don't like the buff limit, and wouldn't it be better to have a plot objective in this? Like you need to get past these guards so you can sabotage the computer. If they get to the alarm, you loose. That kind of thing. Although the treasure patch is a good idea.