src: misc stuff which should belong to a fearture branch