Some updates.
Adjustments