Fix whitespace issues
More prompt touchups