Change multipart to work for us, other improvements