Made some updates, minor tweaks