rewrote to coffee & small fixes