More improvements, moved symbol resolution to CL side, now more symbols are resolved correctly.