few changes, ready for public release