finalizing 0.1.16