more validation added to calculator model