Removed dwarves, streamlined ranged weaponry back to pistols/rifles/antimat again, touched up Vigil