Made safetp less laggy

Also fixed a few misc errors