bug fixes and code tidy up

release ip bug fix.
differentiate between boot drives and data drives.