updated package
update and clean-up