some cleanup.
handle ${/}
ignore for loops more...