added plane, refactored opts