review issues fixed