Some semantic, spelling fixes