Updated data structure, other fixes