Minor bug + order of coffee files fixed