Minor changes committed so I can continue working at work.