Updated to reflect latest mindmap and small bug fix