Fixes & finishing.