Made some overall minor tweaks