some old, minor commits
merging