lots of updates, getting ready to publish