more behaviour fix and cell change
@