Added phrases, many other tweaks