Upgrade done, still cleaning up and making adjustments..