Fixes + polish.