missing changes + cleanup