fixes and additions