checkpoint: some additional ember modeling and fit/finish fixes