Comments and bug fix for parsing user file..