improvements from kibit