Fixed darkf's criticisms