cleaning up, adding options back in.
0.2.2