Fixed a weird error that resulted in us attacking the wrong unit. Did some general cleanup along the way.