Ghostsquad perf

Some updates to ghostsquad's merge.