fixed unresolved symbols and vars