Clean up MIME-type formatting, reorder
Increase default timelimit to match RFC, make data command wait longer, see #293