debug commit
reorder some parsing