bunch of bux fixes for pilot launch