tidy-up and pkg update