Several fixes. Version updates.