Minor Updates

Some aditional work.