Updates for code as used in paper