Fixes and additions everywhere...