About the pissed off genie:
Keep in mind many genies, or djinni, were originally enslaved by King Solomon and stored within various trinkets so they couldn't roam free and cause mayhem. Presumably some are meaner than others, and the nicer ones are actually grateful to be released, thus the three wishes. The mean ones generally kill the poor person who releases them, or grants them three wishes and purposely fouls them up in some way (exploiting loopholes). So I don't see anything wrong with a djinn being so pissed off that he traps the next human he sees.