Implement white sword + minor changes to dev opts