remove encoding
added some more options