cleanup, and nominal addition of epub2/3 option in convert