Comments taken out, Feature bug fixed