Commit12

Add detention finished and autocomplete fixed