Small improvements and additions.