Changed / fixed issues caused by pull request #95

This should eliminate all your mentioned issues, except the last one (converting to JSONP), for which I'll need more time.