Re-added favourites functionality, tweaks.