Cleaned up a few things and tried to fix the bidding code that is yet
untested