Completed some undone stuff