pre-launch bug fixes and enhancements