[#16] small corrections