testing and fixes for parser completed, should work for everything