Update for #23, #26, #27