Minor

A few changes and getting everything in order.