Fixed recursion bug in EtaLocation, and updated JavaDoc