UP structure and fixes so that first parse seams to work