fixed content-transfer-encoding bug
added todo