ticket:13 simple improvements