Fixing counters, fixing particles, adding performance options