Import bslx phase 2 results.
Review issues fix.
Address uninitialized variable warnings
Update "for testing only" includes