small update + cleanup