Fixes + improvements.