Make lens function work; minor change to packaging