Corrected some functional bugs,
changed field names to match Data base columns