Various fixes/cleanups#39

N-R-K wants to merge 4 commits intodudik:masterdudik/herbe:masterfrom

N-R-K:various_fixesN-R-K/herbe:various_fixesCopy head branch name to clipboard