Removed unneeded depndencies. Fixed function names / messages etc