Phil's updates

These must be accepted to make the code awesome.