minor fixes, see README for details