Assessment (Add/Remove)

Fixing some glitches