added most of the edits from Denisa but still need some fixes.