Likes first integration and minor improvements