Multiple fixes and variable parsing

Big update. This update adds single variable parsing.
Major work has been done, time to just iron out bugs.