EA URL changes fixed and some refactoring to make things easier next time...