Touched up some stuff and made it suitable for packaging