Multiple argument support on boot(), small fixes