One bug fixed, indentation corrected