Did some fixes with scoping within if blocks
Bug fix that made everything useless
Added parsing for function calls