Minor NB update
Fix minor parser bugs
Change Vectors to ArrayLists
Fix minor NB error to make it compile