various fixes, see README