cleanup; add stubs to check FROM

pass along line number for specific commands like FROM