Removed TODO and added an issue in tracker for the same
Added a few small notes
Documentation for entities