Finish minor details