FIX: Adapted to Changes in Restore class
FIX: PhishTankInterface downloading data too early
FIX: Java code conventions