Add some comments, fix some indentation mistakes