Fixed project properties, added datastructures from ShortCircuit