Improved load speed by adding resources expiration
Fixed typos