fixed bugs with function calls & variable calls