Better counter offers and cleaned up code