small fixes and additions