Updated Error Checking
More tests added
Check LineNum, Organize code