forms added, extra validation added
tabs to spaces