Minor fixes to the spots added, which didn't always connect well with the user