misc. changes/fixes for launch