diff --git a/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate b/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate
index 65fed72..529d9be 100755
Binary files a/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate and b/AutoImagrNBI.xcodeproj/project.xcworkspace/xcuserdata/btoms.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/AutoImagrNBI/AutoImagrNBI-Info.plist b/AutoImagrNBI/AutoImagrNBI-Info.plist
index 5a11a16..79fc2bb 100755
--- a/AutoImagrNBI/AutoImagrNBI-Info.plist
+++ b/AutoImagrNBI/AutoImagrNBI-Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript b/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript
index 1635d88..cace41b 100755
--- a/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript
+++ b/AutoImagrNBI/AutoImagrNBIAppDelegate.applescript
@@ -42,7 +42,6 @@ script AutoImagrNBIAppDelegate
     property hostMacOSVersionMajor : ""
     property selectedOSdmgVersionToDelim : ""
     property selectedOSdmgVersionMajor : ""
-    property ImagrAndImagrVersionCheckTextfield : ""
     property netBootImageIndexMinValue : ""
     property netBootImageIndexMaxValue : ""
     property netBootImageIndex : ""
@@ -134,9 +133,9 @@ script AutoImagrNBIAppDelegate
     property buildProcessProgressBarIndeterminate : false
     property buildProcessProgressBarAniminate : false
     property netBootCreationSuccessful : false
-    property netBootServeOverNFS : true
+    property netBootServeOverNFS : false
     property customDesktopImageEnabled : false
-    property installRCNetBootSelected : false
+    property installRCNetBootSelected : true
     property timeServerOptionsEnabled : false
     property createReadOnlyDMG : false
     property userNotifyErrorHidden : true
@@ -145,7 +144,7 @@ script AutoImagrNBIAppDelegate
     property buildButtonPreCheckPassed : true
     property closeButtonPreCheckPassed : true
     property simpleFinderEnabled : false
-    property servedFromNetSUS : false
+    property servedFromNetSUS : true
     property logNewLine : true
     property isAdminUser : false
     property pkgsMissing : false
@@ -657,7 +656,7 @@ script AutoImagrNBIAppDelegate
     -- Make sure OS & Imaging.app is specified before proceeding, once checked enable Imagr options, as well as Build & Option buttons
     on checkIfReadyToProceed_(sender)
         -- Make sure imagrConfigURL has a value before we proceed
-        if (my imagrConfigURL is not equal to missing value) or (my imagrConfigURL is not equal to "") then
+        if (my imagrConfigURL is not equal to missing value) and (my imagrConfigURL is not equal to "") then
             -- Set to true so we can continue
             set imagrConfigURLCheckPass to true
         end if
@@ -1508,8 +1507,8 @@ script AutoImagrNBIAppDelegate
         netBootName_(me)
         -- Error if incorrect value specified
         netBootImageIndexCheck_(me)
-        -- Check the Imagr URL details & try & get version of the Imagr
-        checkimagrURL_(me)
+        -- Bound to "Install modified rc.netboot file" checkbox, sets plist
+        installRCNetBootCheckBox_(me)
         -- Set to boolean of value
         set buildButtonPreCheckPassed to buildButtonPreCheckPassed as boolean
         -- Proceed if we've passed precheck
@@ -4077,10 +4076,6 @@ script AutoImagrNBIAppDelegate
                 --Log Action
                 set logMe to "Set .nbi to RootPath"
                 logToFile_(me)
-                ---- Serve Over ---
-                --Log Action
-                set logMe to "Setting NBImageInfo.plist's serve over option"
-                logToFile_(me)
                 ---- ImageType ----
                 -- Update Build Process Window's Text Field
                 set my buildProcessTextField to "Setting NBImageInfo.plist ImageType"
diff --git a/AutoImagrNBI/MainMenu.xib b/AutoImagrNBI/MainMenu.xib
index 768bce3..daa4c1c 100644
--- a/AutoImagrNBI/MainMenu.xib
+++ b/AutoImagrNBI/MainMenu.xib
@@ -190,6 +190,17 @@
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        <connections>
+                                            <binding destination="Voe-Tx-rLC" name="value" keyPath="imagrConfigURL" id="Ks8-Jf-Nn9">
+                                                <dictionary key="options">
+                                                    <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/>
+                                                    <bool key="NSConditionallySetsEditable" value="NO"/>
+                                                    <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+                                                    <bool key="NSRaisesForNotApplicableKeys" value="NO"/>
+                                                    <bool key="NSValidatesImmediately" value="YES"/>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
                                     </textFieldCell>
                                     <connections>
                                         <action selector="checkImagrURL:" target="Voe-Tx-rLC" id="Wog-eV-2du"/>
@@ -310,8 +321,8 @@
                                 <button id="klK-eR-rye">
                                     <rect key="frame" x="138" y="77" width="246" height="18"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <string key="toolTip">If NetBoot is to be served from a NetSUS appliance then the name cannot contain spaces, ticking this will remove spaces from the name.</string>
-                                    <buttonCell key="cell" type="check" title="Will be served from a NetSUS appliance" bezelStyle="regularSquare" imagePosition="left" controlSize="small" enabled="NO" inset="2" id="ePG-Pe-Zsf">
+                                    <string key="toolTip">If NetBoot is to be served from NetSUS or BSDPy then the name cannot contain spaces, ticking this will remove spaces from the name.</string>
+                                    <buttonCell key="cell" type="check" title="Will be served from NetSUS or BSDPy" bezelStyle="regularSquare" imagePosition="left" controlSize="small" enabled="NO" inset="2" id="ePG-Pe-Zsf">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="smallSystem"/>
                                     </buttonCell>
@@ -1260,7 +1271,7 @@ CA
                                                     <button toolTip="Installs a modifed rc.netboot file, this will not create shadow files on the NetBoot server." id="OEs-ku-2dk">
                                                         <rect key="frame" x="109" y="31" width="183" height="18"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                        <buttonCell key="cell" type="check" title="Install modified rc.netboot file" bezelStyle="regularSquare" imagePosition="left" inset="2" id="wqh-6g-HMT">
+                                                        <buttonCell key="cell" type="check" title="Install modified rc.netboot file" bezelStyle="regularSquare" imagePosition="left" enabled="NO" state="on" inset="2" id="wqh-6g-HMT">
                                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                             <font key="font" metaFont="smallSystem"/>
                                                         </buttonCell>