Background on this particular job is: while I was on vacation, apparently this client called and asked for a logo work up. The other day she calls and said it has been two weeks and she hasn't heard anything so I tell her I will look in to it. After I hang up the other designer says "oh yeah, I forgot about that" and hands me a piece of paper with her info scribbled on it. So I whip up 3 options and send them out the next day. Knowing this client, I rightfully assume she isn't going to want to pay for a fully custom logo, so the logos contained royalty free objects to save me time, and her money. I explained the trademark restrictions of this to the client and she was fine with it. After reworking one of the initial 3 to her specs, I sent an invoice for 3 hours. She somehow didn't realize that it was going to cost this much, and threw a mini fit, so I asked her what she was going to use the logo for currently and she said that she just needed it for her Facebook page at the moment, so I told her that I will only charge her the first hour and I will send her a sized jpeg for use on Facebook, and we can release the vector art and attribution rights when the other 2 hours are paid for. She seemed happy with the arrangement so I drew up the papers. Am I being an a$$ or a pushover?