fixed final mistakes