A few fixes and additions