Finish minor things and get it done