Lots of changes to prevent unnecesery downloads. Plus some other sanity changes