Fixed resources downloads; cleaned up resources