large commit, add settings and update some coffee