The second issue was discussed some time ago, and IIRC it was decided to keep track of which characters leave combat, so if they returned they would be added to the following turn. I'm not sure what the status is on that, though.