Some structure and function edits