patch and some edits in previous posts