Progress on misc. discussed changes