V1.2: Bug fixes + useless data removal.