Flats and sharps now appear. Buggy, though