Rendering optimisation and fs fixes