More bug fixes. More pending.