Add offers and fix bugs