More updates to structure and comments