Update data structure, serial annotations, code clean up