Coffee fix2

Fixed CLA issues (I think), and added additional commits to comply with @bajtos requests.
In the spirit of the comment above, `otherFiles` should be renamed to something like `allFiles`