[FIX] Some semantic changes and fix of an empty entry problem.

Started the pull request to show we are actively working on it (as discussed with Dave)