Add some comments and fix aligment