Initialization of our datastructures + minor bug correction (or creation?) in datastructures