Remove bugs, improvement entity handling, comments

Change-Id: I4e2bc21ceda0d84f195a9b0040e7e6a23f0cc26f