add comments
refactor packages
avoid exceptions when removing renditions