Minor big fixes and interface changes for error fix form