#196 several small details