Partial Commit
Bug no elem fixed.
Merge fixed.
Display of elem on curor fixed.