Expand documentation/testing, add options