Added missing @Override annotations
Re-ordered and clarified export options

Also added missing @Override annotations