more code finishing

and commenting