Update packaging and TODO