Some updates following code review; not completed or tested yet