Fixed few bugs; Added more validation patterns;

Signed-off-by: ashwinh <ashwinh@cybage.com>