Made a few key updates...