optimised sample parsing tables; minor data format change