minor changes
I MERGED IT ALL!