Fixing typo, ident code, minor bugs
trying to fix ident once more.. o.Ó