Fixed gcc warnings and added some rationale around yesterday's fix