fix keyword printing
add EVars and EFunction test
maybe fix comment handling