Finish and fix some mistakes