Moved some stuff, fixed bug in overcounting (slightly) re-auctions.

100th commit!