Improving lvl 16, updating reference

Closes #12, among other things.