Fixed favoriting, and some smaller error checking issues