Fixed bugs and added more phrases