Auto increment dictionary, new map intialisation, better comments