More comments, some codes refactored, among other things..