changed current list and fix errors