Added some comments, fixed something...