Todays game

I don't think you should trade your light squared bishop with 16. Bd3. This is one of your best attacking pieces in this position. The opponent's bishop on a6 is more of a nuisance than really holding you back. You could play 16. Nd3. Another possibility is 16. e6 where you will force the black king to reside in the center permanently.
17. ... Nf8 looks just bad to me.
21. ... 0-0 is obviously bad. Isn'tblack doing fine with 21. ... Ndc5 or 21. ... Bc5? Is white threatening Qf5 or something? I'm not sure where that leads.
I would like to hear your comments on the game, ive done my best to annotate