made small edits and added todos