Coffee fix2

Fixed CLA issues (I think), and added additional commits to comply with @bajtos requests.