Major fixes fb impl. and resources