fixed regexes to only match cur bundle
fixed text