Various updates - optimising and minifying