fixed open issues after review