Cleaner options, closes #10, #5.