Remove TODO; fix small VARIABLES bug in compile:main