whoopsie nbsp fix. Still needs TODO: cleanup