var fixes
removed script.favourites dependency
cleanup
cleanup
more cleanup
cleanup