finalizing todo's before merging