Auto-add case to plan, fix case returns, fix setup.py