integrate some design changes
more dataset schema changes and minor design tweaks