The govt is un shut down. So what happened?

We are all glad the US govt didn't shut down last night. A deal was struck at the 11th hour (maybe the 12th hour).
I'd like to know just what the deal was. The deal makers are claiming $38.5 billion in "cuts". I'd like to know just what got cut, by how much, and what kind of cut we are talking about. Real cuts mean the agency gets less money than it got last year. Fake cuts, popular in DC, mean the agency got less than it asked for, or less money than Obama proposed. Does the $38.5 billion include the cuts tacked onto the last two continuing resolutions? The $38.5 billion is a whole lot better than nothing, but a whole lot less than the $100 billion the Republicans were asking for.
Apparently the riders to defund Planned Parenthood and Obamacare were dropped.
What else was on the table that didn't make it?
Anyhow it's good that Congresscritters are talking about cuts. Even fake cuts.