Fixed saved input values validation. Few minor changes and fixes.