New concurrrency in action, some makefile changes and datastructures