fav additions + cleanup