Fix/Improve comments and some code.