finished some commenting