updates, getting ready for packaging