now with less typos and complete package manifest