finishing touches with some commenting