coffeesam: a lot of changes