update to BS 3.0.1 and major clean up and fixes