fixed mappings, bracket counting & performance thingy