I think fixed everything, looks pretty good now. need to check quantitativly