more detection code
fixes
new mounting code to try to clean things up
new mounting code to try to clean things up