Adding optional params, updating onepw, tests. Fixes #55, #54, #52