Fixed egregious lack of function and poor flow.