Add entity comments + A lot of fixes...