Fixes + some additions.