fixes and remove favorite feature - tests passing