adds Coffee cleanup and minor fix