fixes and draft for optimize load time