package fix + cleanup