Fixes + additions