updated build order and clarified some comments
Merge branch 'effhist' into staging