spelling
safety rebuild (wip)