Fix whitespace errors - no functional changes
Remove all warnings, and set optimization levels to O2
add a disconnect