Update bundle architecture and minor other updates (to scripts and bundle overlay)
Minor updates