Fixed various whitespace and logi issues.