Minor bug. Additions still not tested.
Variables span error detected. A fix in the init method is still pending.