more cleanup

cleanup and push-through of options struct