Minor Elbow Injury...?

It isn't serious enough to go to a Doctor...just wondering if anyone may have an idea as to what's going on/tips on how to help pain management. :)

When I was a kid, I did a doozy on my elbow and hyperextended it doing a cartwheel and was in a sling for a while. Well, since then, the joint locks up on me every now and then, and it isn't particularly painful, just uncomfortable until I pop it (like your knuckles feel until you crack them. I do the same...but to my elbow).

Yesterday I did a Bi and Tri routine and tried preacher curls and tri extensions for the first time and, naturally, I'm sore. But my elbow is the worst. It's sore on the flat under-arm side right in the bend. When it's rested, I don't feel anything, but pressing on it or moving it is, well, painful. (Needless to say, I will be modifying my routine in the future -- any suggestions to replace preacher curls besides hammer curls?).

Along with rest/ice/NSAIDs, is there anything else I can do for it? Certain way to wrap it, etc for any relief / healing?

Thanks in advance! :)