minor fixes, getting close to launch