some small fixes and additions