Readibility improvments, TODO's

Mostly just moving text around and commenting where helpful.