Added filtering out of non-coffee paths, small bug fixes.