Multiple fixes and additions