Package cleanup
Add -s/--sticky option