Enable comments and some changes in local cache