Added WaxoDotpath, rewrote Regex bit.