Improves the packaging, adds comments