fixing regex and added lists