likes implementation and other fixes