finishing up favorites, ready to merge into master