#14 various small changes