added support for more variable types, fixed bug for when no variables are specified, tested with ops test cmd.