Add option to not add on boot
Added -w wait argument