added some bits to the main init cmd script
fixed conflicts