Fixed some logic in ARGV parsing, got rid of box deletion on provisionin...

...g, and other small things