finished favourites, included file upload, did many other small fixes