bug fixes, getting ready for production