fixing regex issues
updating build files with latest code