Fixed some variable-specific and CLI reading stuff